Fix serial number comparison regression introduced recently. (#474897)

2007-09-10  Behdad Esfahbod  <behdad@gnome.org>

        * gdk/x11/gdkgeometry-x11.c (gdk_window_queue),
        (_gdk_window_process_expose): Fix serial number comparison regression
        introduced recently. (#474897)

svn path=/trunk/; revision=18789

diff --git a/ChangeLog b/ChangeLog
index 3c72fb321b7cc2e8b08b80c4f9b4ac49e8042f76..a742a6238bff8d12e4245e45ca60500b5975bcca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-10  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gdk/x11/gdkgeometry-x11.c (gdk_window_queue),
+       (_gdk_window_process_expose): Fix serial number comparison regression
+       introduced recently. (#474897)
+
 2007-09-10  Richard Hult  <richard@imendio.com>
 
        * gtk/gtksearchenginesimple.h: Build fix, correct a typo in the

diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 017acfdeff05533daae0935bdee08a6e218831a7..da572a8d131b4f7cbcc32291a41d970a15ebb95b 100644 (file)
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -1052,7 +1052,8 @@ gdk_window_queue (GdkWindow          *window,
          GdkWindowQueueItem *item = tmp_list->data;
          GList *next = tmp_list->next;
          
-          if (serial - item->serial < 0x7FFFFFFF)
+         /* an overflow-safe (item->serial < serial) */
+         if (item->serial - serial > (gulong) G_MAXLONG)
            {
              queue_delete_link (display_x11->translate_queue, tmp_list);
              queue_item_free (item);
@@ -1143,7 +1144,9 @@ _gdk_window_process_expose (GdkWindow    *window,
        {
          GdkWindowQueueItem *item = tmp_list->data;
           GList *next = tmp_list->next;
-          if (item->serial - serial < 0x7FFFFFFF)
+         
+         /* an overflow-safe (serial < item->serial) */
+         if (serial - item->serial > (gulong) G_MAXLONG)
            {
              if (item->window == window)
                {